merge trunk
authorK. Handa <handa@gnu.org>
Sun, 22 Sep 2013 12:32:08 +0000 (21:32 +0900)
committerK. Handa <handa@gnu.org>
Sun, 22 Sep 2013 12:32:08 +0000 (21:32 +0900)
commit9b073c4217f9e908ec67aca4e701ff663d89821a
treeab42811dfeeaae08cd026668222db8cf98aac013
parent183b72d129ab61234463da01e8b35a3c7516beff
parent05d05438dee465d0e9eee0f61d5f56df91be9ce0
merge trunk